From c480a93c359815145fcb2c72a3e6df86e2319d3c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 12 Aug 2022 00:49:25 +0100 Subject: [PATCH] Refresh patch series --- .../Work-around-1014417-in-Meson.patch | 28 +++++++++---------- .../debian/Disable-clipboard-test.patch | 2 +- ...ng-tests-on-mips-family-architecture.patch | 10 +++---- ...ces-Report-how-much-the-images-diffe.patch | 6 ++-- ...ow-minor-differences-to-be-tolerated.patch | 6 ++-- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/debian/patches/Work-around-1014417-in-Meson.patch b/debian/patches/Work-around-1014417-in-Meson.patch index d2afe24351..014b2251e2 100644 --- a/debian/patches/Work-around-1014417-in-Meson.patch +++ b/debian/patches/Work-around-1014417-in-Meson.patch @@ -103,7 +103,7 @@ index d0fdd0d..3029f53 100644 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()) diff --git a/testsuite/css/style/meson.build b/testsuite/css/style/meson.build -index 9dc0f4c..c543a16 100644 +index 3228049..a17b0c4 100644 --- a/testsuite/css/style/meson.build +++ b/testsuite/css/style/meson.build @@ -28,7 +28,7 @@ test_style = executable( @@ -116,10 +116,10 @@ index 9dc0f4c..c543a16 100644 suite: 'css', ) diff --git a/testsuite/gdk/meson.build b/testsuite/gdk/meson.build -index 14b2c85..533cd9b 100644 +index af93721..6fea1f6 100644 --- a/testsuite/gdk/meson.build +++ b/testsuite/gdk/meson.build -@@ -41,7 +41,7 @@ foreach t : tests +@@ -40,7 +40,7 @@ foreach t : tests test(test_name, test_exe, args: [ '--tap', '-k' ], @@ -138,10 +138,10 @@ index 14b2c85..533cd9b 100644 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build -index 8c3ff1f..9c60dbd 100644 +index c780008..db97e03 100644 --- a/testsuite/gsk/meson.build +++ b/testsuite/gsk/meson.build -@@ -233,7 +233,7 @@ foreach t : tests +@@ -262,7 +262,7 @@ foreach t : tests test(test_name, test_exe, args: [ '--tap', '-k' ], @@ -150,7 +150,7 @@ index 8c3ff1f..9c60dbd 100644 env: [ 'GSK_RENDERER=cairo', 'GTK_A11Y=test', -@@ -265,7 +265,7 @@ foreach t : internal_tests +@@ -296,7 +296,7 @@ foreach t : internal_tests test(test_name, test_exe, args: [ '--tap', '-k' ], @@ -160,10 +160,10 @@ index 8c3ff1f..9c60dbd 100644 'GSK_RENDERER=cairo', 'GTK_A11Y=test', diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build -index 3324664..de24177 100644 +index 4c5d70a..e02e37a 100644 --- a/testsuite/gtk/meson.build +++ b/testsuite/gtk/meson.build -@@ -184,7 +184,7 @@ foreach t : tests +@@ -187,7 +187,7 @@ foreach t : tests test(test_name, test_exe, args: [ '--tap', '-k' ], @@ -172,7 +172,7 @@ index 3324664..de24177 100644 timeout: test_timeout, env: test_env, suite: ['gtk'] + test_extra_suites, -@@ -217,7 +217,7 @@ foreach t : internal_tests +@@ -220,7 +220,7 @@ foreach t : internal_tests test(test_name, test_exe, args: [ '--tap', '-k' ], @@ -181,7 +181,7 @@ index 3324664..de24177 100644 timeout: test_timeout, env: test_env, suite: ['gtk'] + test_extra_suites, -@@ -235,7 +235,7 @@ if add_languages('cpp', required: false, native: false) +@@ -238,7 +238,7 @@ if add_languages('cpp', required: false, native: false) ) test('c++ keywords', test_exe, args: [ '--tap', '-k' ], @@ -209,10 +209,10 @@ index 97344f3..05d6a57 100644 'GIO_USE_VOLUME_MONITOR=unix', 'GSETTINGS_BACKEND=memory', diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index aa4d3c7..3706baf 100644 +index 8062854..9af1bf9 100644 --- a/testsuite/reftests/gtk-reftest.c +++ b/testsuite/reftests/gtk-reftest.c -@@ -602,9 +602,5 @@ main (int argc, char **argv) +@@ -618,9 +618,5 @@ main (int argc, char **argv) result = g_test_run (); @@ -223,10 +223,10 @@ index aa4d3c7..3706baf 100644 } - diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build -index 2c6e104..33e307a 100644 +index e5fe2af..504ea01 100644 --- a/testsuite/reftests/meson.build +++ b/testsuite/reftests/meson.build -@@ -607,7 +607,7 @@ foreach testname : testdata +@@ -631,7 +631,7 @@ foreach testname : testdata '-o', join_paths(meson.current_build_dir(), 'output'), join_paths(meson.current_source_dir(), testname), ], diff --git a/debian/patches/debian/Disable-clipboard-test.patch b/debian/patches/debian/Disable-clipboard-test.patch index 44eec5c6fd..2b560c4538 100644 --- a/debian/patches/debian/Disable-clipboard-test.patch +++ b/debian/patches/debian/Disable-clipboard-test.patch @@ -12,7 +12,7 @@ Forwarded: no 1 file changed, 1 deletion(-) diff --git a/testsuite/gdk/meson.build b/testsuite/gdk/meson.build -index 3de704f..14b2c85 100644 +index 03528a3..af93721 100644 --- a/testsuite/gdk/meson.build +++ b/testsuite/gdk/meson.build @@ -12,7 +12,6 @@ clipboard_client = executable('clipboard-client', diff --git a/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch b/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch index f24191231a..1e312d51c2 100644 --- a/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch +++ b/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch @@ -9,10 +9,10 @@ Forwarded: no 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build -index 2fb0208..8c3ff1f 100644 +index 82fe0d5..c780008 100644 --- a/testsuite/gsk/meson.build +++ b/testsuite/gsk/meson.build -@@ -77,9 +77,7 @@ compare_render_tests = [ +@@ -78,9 +78,7 @@ compare_render_tests = [ 'scale-up-down', 'shadow-in-opacity', 'texture-url', @@ -22,7 +22,7 @@ index 2fb0208..8c3ff1f 100644 'repeat-texture', 'transform-in-transform', 'transform-in-transform-in-transform', -@@ -87,6 +85,14 @@ compare_render_tests = [ +@@ -88,6 +86,14 @@ compare_render_tests = [ 'rounded-clip-in-clip-3d', # not really 3d, but cairo fails it ] @@ -38,7 +38,7 @@ index 2fb0208..8c3ff1f 100644 # to run in ci, but still useful to keep around informative_render_tests = [ diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build -index 301f8bd..2c6e104 100644 +index 2cd31db..e5fe2af 100644 --- a/testsuite/reftests/meson.build +++ b/testsuite/reftests/meson.build @@ -71,9 +71,6 @@ testdata = [ @@ -61,7 +61,7 @@ index 301f8bd..2c6e104 100644 'background-repeat-clip.css', 'background-repeat-clip.ref.ui', 'background-repeat-clip.ui', -@@ -582,6 +576,19 @@ xfails = [ +@@ -606,6 +600,19 @@ xfails = [ 'border-half-pixel.ui' ] diff --git a/debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch b/debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch index f48bd7ad70..c772906cc5 100644 --- a/debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch +++ b/debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch @@ -42,10 +42,10 @@ index 919957e..7145363 100644 g_object_unref (diff_texture); success = FALSE; diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index 4d3d57d..5136efa 100644 +index a057a2e..78cd4dc 100644 --- a/testsuite/reftests/gtk-reftest.c +++ b/testsuite/reftests/gtk-reftest.c -@@ -331,6 +331,9 @@ test_ui_file (GFile *file) +@@ -347,6 +347,9 @@ test_ui_file (GFile *file) char *ui_file, *reference_file; GdkTexture *ui_image, *reference_image, *diff_image; GtkStyleProvider *provider; @@ -55,7 +55,7 @@ index 4d3d57d..5136efa 100644 ui_file = g_file_get_path (file); -@@ -362,12 +365,16 @@ test_ui_file (GFile *file) +@@ -378,12 +381,16 @@ test_ui_file (GFile *file) if (reference_image == NULL) reference_image = gdk_memory_texture_new (1, 1, GDK_MEMORY_DEFAULT, g_bytes_new ((guchar[4]) {0, 0, 0, 0}, 4), 4); diff --git a/debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch b/debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch index b56477259e..f45ae07375 100644 --- a/debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch +++ b/debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch @@ -82,10 +82,10 @@ index 7145363..2d5fdf9 100644 } diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index 5136efa..aa4d3c7 100644 +index 78cd4dc..8062854 100644 --- a/testsuite/reftests/gtk-reftest.c +++ b/testsuite/reftests/gtk-reftest.c -@@ -292,6 +292,12 @@ save_image (GdkTexture *texture, +@@ -308,6 +308,12 @@ save_image (GdkTexture *texture, g_free (filename); } @@ -98,7 +98,7 @@ index 5136efa..aa4d3c7 100644 static void save_node (GskRenderNode *node, const char *test_name, -@@ -373,13 +379,37 @@ test_ui_file (GFile *file) +@@ -389,13 +395,37 @@ test_ui_file (GFile *file) if (diff_image) { -- 2.30.2